Autogenerated HTML docs for v1.5.5.1-248-g4b17
diff --git a/merge-config.txt b/merge-config.txt index 9719311..48ce747 100644 --- a/merge-config.txt +++ b/merge-config.txt
@@ -6,6 +6,11 @@ Whether to include summaries of merged commits in newly created merge commit messages. False by default. +merge.renameLimit:: + The number of files to consider when performing rename detection + during a merge; if not specified, defaults to the value of + diff.renameLimit. + merge.tool:: Controls which merge resolution program is used by linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
